remove NFT protocols for V4 router #348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ewilz
reviewed
Jun 6, 2024
ewilz
reviewed
Jun 6, 2024
contracts/UniversalRouter.sol
Outdated
| @@ -79,6 +60,6 @@ contract UniversalRouter is IUniversalRouter, Dispatcher, RewardsCollector { | |||
| return command & Commands.FLAG_ALLOW_REVERT == 0; | |||
| } | |||
|
|
|||
| /// @notice To receive ETH from WETH and NFT protocols | |||
| /// @notice To receive ETH from WETH protocols | |||
There was a problem hiding this comment.
I think we can finally add this in now?
require(msg.sender == WETH9, 'Not WETH9');
There was a problem hiding this comment.
that's been a huge thorn in our side
There was a problem hiding this comment.
we'll probably need to check that it's either WETH or v4 PoolManager
ewilz
reviewed
Jun 6, 2024
| expect(miladyBalanceAfter.sub(miladyBalanceBefore)).to.eq(numMiladys) | ||
| }) | ||
| }) | ||
| it('reverts if no commands are allowed to revert') |
There was a problem hiding this comment.
yeeah need to completely rewrite them as they were all written for NFTs
ewilz
reviewed
Jun 6, 2024
ewilz
requested changes
Jun 6, 2024
hensha256
added a commit
that referenced
this pull request
Jun 12, 2024
* solc upgrade to 0.8.26 * use mainnet permit2 work started * fix uniswap tests * Remove block from resetFork * Refactor to fetch fee tiers * remove NFT protocols for V4 router (#348) * first pass * fix forge builds * fix reentrancy test * Add check to receive
hensha256
added a commit
that referenced
this pull request
Jun 14, 2024
* update hardhat * remove symlinks by using hardhat-foundry use hardhat-foundry package to use foundry remappings to compile. Symlinks are no longer necessary After upgrade HH412 error was thrown caused by the existing symlinks ref: https://hardhat.org/hardhat-runner/docs/errors#HH412 NomicFoundation/hardhat#3623 * update compiler version to ^0.8.24 supporting the cancun upgrades * fix ci * fix lock file * Update yarn.lock * regenerate gas snapshots * install foundry in ci * Use mainnet permit2 (#347) * solc upgrade to 0.8.26 * use mainnet permit2 work started * fix uniswap tests * Remove block from resetFork * Refactor to fetch fee tiers * remove NFT protocols for V4 router (#348) * first pass * fix forge builds * fix reentrancy test * Add check to receive * remove .only rip * add todo for tests that need wrtiting * update readme and planner --------- Co-authored-by: Alice <34962750+hensha256@users.noreply.github.com> Co-authored-by: Alice Henshaw <henshawalice@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove NFT protocols to prepare for a new version that supports uniswap v2, v3 and v4